Merge
authorKeir Fraser <keir.fraser@citrix.com>
Wed, 11 Aug 2010 17:26:47 +0000 (18:26 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Wed, 11 Aug 2010 17:26:47 +0000 (18:26 +0100)

Trivial merge